From e4a7d87d548e41bed016c8107d49b6ea2a7f324a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 9 Feb 2023 09:35:48 +0000 Subject: [PATCH] Drop patches that were applied (some a little differently) upstream --- .../Update-Abkhazian-translation.patch | 306 ---------- .../Update-Turkish-translation-1.patch | 114 ---- .../Update-Turkish-translation-2.patch | 121 ---- .../patches/Update-Turkish-translation.patch | 291 ---------- .../debian/Disable-clipboard-test.patch | 4 +- ...isable-inscription-markup.ui-reftest.patch | 4 +- ...ces-Report-how-much-the-images-diffe.patch | 6 +- ...ow-minor-differences-to-be-tolerated.patch | 6 +- ...ooser-Drop-a-few-errant-translations.patch | 35 -- ...andle-clicks-outside-client-surfaces.patch | 88 --- ...-Reset-all-scroll-valuators-on-enter.patch | 45 -- ...nly-create-cells-when-the-column-is-.patch | 73 --- ...matedstyle-Fix-return-of-new_advance.patch | 34 -- ...-data-relative-to-current-working-di.patch | 31 - debian/patches/series | 12 - ...e-.test-files-for-flaky-or-failing-t.patch | 49 -- ...e-setups-for-unstable-tests-instead-.patch | 545 ------------------ 17 files changed, 10 insertions(+), 1754 deletions(-) delete mode 100644 debian/patches/Update-Abkhazian-translation.patch delete mode 100644 debian/patches/Update-Turkish-translation-1.patch delete mode 100644 debian/patches/Update-Turkish-translation-2.patch delete mode 100644 debian/patches/Update-Turkish-translation.patch delete mode 100644 debian/patches/fontchooser-Drop-a-few-errant-translations.patch delete mode 100644 debian/patches/gdk-surface-Handle-clicks-outside-client-surfaces.patch delete mode 100644 debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch delete mode 100644 debian/patches/gtkcolumnviewcolumn-Only-create-cells-when-the-column-is-.patch delete mode 100644 debian/patches/gtkcssanimatedstyle-Fix-return-of-new_advance.patch delete mode 100644 debian/patches/node-editor-Save-test-data-relative-to-current-working-di.patch delete mode 100644 debian/patches/testsuite-Don-t-create-.test-files-for-flaky-or-failing-t.patch delete mode 100644 debian/patches/testsuite-Use-separate-setups-for-unstable-tests-instead-.patch diff --git a/debian/patches/Update-Abkhazian-translation.patch b/debian/patches/Update-Abkhazian-translation.patch deleted file mode 100644 index 114d9d851c..0000000000 --- a/debian/patches/Update-Abkhazian-translation.patch +++ /dev/null @@ -1,306 +0,0 @@ -From: Nart Tlisha -Date: Thu, 5 Jan 2023 12:23:44 +0000 -Subject: Update Abkhazian translation - -Origin: upstream, 4.8.4, commit:1e27563425094d40bbf14a2c0c38ebb134753baf ---- - po/ab.po | 92 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 46 insertions(+), 46 deletions(-) - -diff --git a/po/ab.po b/po/ab.po -index 0eb4521..c5d8409 100644 ---- a/po/ab.po -+++ b/po/ab.po -@@ -1,7 +1,7 @@ - msgid "" - msgstr "" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gtk/-/issues/\n" --"POT-Creation-Date: 2022-11-18 18:26+0000\n" -+"POT-Creation-Date: 2023-01-02 15:10+0000\n" - "Last-Translator: Нанба Наала \n" - "Language-Team: Abkhazian \n" - "Language: ab\n" -@@ -99,12 +99,12 @@ msgstr "" - msgid "No compatible formats to transfer contents." - msgstr "" - --#: gdk/gdkglcontext.c:394 gdk/x11/gdkglcontext-glx.c:604 -+#: gdk/gdkglcontext.c:394 gdk/x11/gdkglcontext-glx.c:610 - msgid "No GL API allowed." - msgstr "" - - #: gdk/gdkglcontext.c:418 gdk/win32/gdkglcontext-win32-wgl.c:611 --#: gdk/x11/gdkglcontext-glx.c:638 -+#: gdk/x11/gdkglcontext-glx.c:644 - msgid "Unable to create a GL context" - msgstr "" - -@@ -749,15 +749,15 @@ msgstr "" - msgid "Cannot store clipboard. No clipboard manager is active." - msgstr "" - --#: gdk/x11/gdkglcontext-glx.c:754 -+#: gdk/x11/gdkglcontext-glx.c:760 - msgid "No GLX configurations available" - msgstr "" - --#: gdk/x11/gdkglcontext-glx.c:827 -+#: gdk/x11/gdkglcontext-glx.c:833 - msgid "No GLX configuration with required features found" - msgstr "" - --#: gdk/x11/gdkglcontext-glx.c:901 -+#: gdk/x11/gdkglcontext-glx.c:907 - msgid "GLX is not supported" - msgstr "" - -@@ -1998,7 +1998,7 @@ msgstr "_Ҵаҟа" - - #: gtk/gtkcustompaperunixdialog.c:992 - msgid "_Left:" --msgstr "А_рмарахь:" -+msgstr "А_рмарала:" - - #: gtk/gtkcustompaperunixdialog.c:1003 - msgid "_Right:" -@@ -2075,7 +2075,7 @@ msgstr "" - #: gtk/gtkfilechoosernative.c:509 gtk/gtkfilechoosernative.c:580 - #: gtk/gtkfilechooserwidget.c:1210 gtk/gtkfilechooserwidget.c:5800 - #: gtk/gtkmessagedialog.c:166 gtk/gtkmessagedialog.c:175 --#: gtk/gtkmountoperation.c:608 gtk/gtkpagesetupunixdialog.c:283 -+#: gtk/gtkmountoperation.c:604 gtk/gtkpagesetupunixdialog.c:283 - #: gtk/gtkprintbackend.c:637 gtk/gtkprinteroptionwidget.c:721 - #: gtk/gtkprintunixdialog.c:651 gtk/gtkprintunixdialog.c:807 - #: gtk/gtkwindow.c:6152 gtk/inspector/css-editor.c:248 -@@ -2169,7 +2169,7 @@ msgid "If you delete an item, it will be permanently lost." - msgstr "" - - #: gtk/gtkfilechooserwidget.c:1211 gtk/gtkfilechooserwidget.c:1827 --#: gtk/gtklabel.c:5652 gtk/gtktext.c:6061 gtk/gtktextview.c:8966 -+#: gtk/gtklabel.c:5652 gtk/gtktext.c:6065 gtk/gtktextview.c:8966 - msgid "_Delete" - msgstr "_Аныхра" - -@@ -2320,7 +2320,7 @@ msgstr "Авидео" - - #: gtk/gtkfilechooserwidget.c:4333 - msgid "Contacts" --msgstr "" -+msgstr "Аимадарақәа" - - #: gtk/gtkfilechooserwidget.c:4334 - msgid "Calendar" -@@ -2465,19 +2465,19 @@ msgstr "Асимволқәа рвариантқәа" - msgid "OpenGL context creation failed" - msgstr "" - --#: gtk/gtklabel.c:5649 gtk/gtktext.c:6049 gtk/gtktextview.c:8954 -+#: gtk/gtklabel.c:5649 gtk/gtktext.c:6053 gtk/gtktextview.c:8954 - msgid "Cu_t" --msgstr "_Агәылԥҟара " -+msgstr "_Агәылԥҟара" - --#: gtk/gtklabel.c:5650 gtk/gtktext.c:6053 gtk/gtktextview.c:8958 -+#: gtk/gtklabel.c:5650 gtk/gtktext.c:6057 gtk/gtktextview.c:8958 - msgid "_Copy" - msgstr "_Ахкьыҧхьаара" - --#: gtk/gtklabel.c:5651 gtk/gtktext.c:6057 gtk/gtktextview.c:8962 -+#: gtk/gtklabel.c:5651 gtk/gtktext.c:6061 gtk/gtktextview.c:8962 - msgid "_Paste" - msgstr "_Абжьаргылара" - --#: gtk/gtklabel.c:5657 gtk/gtktext.c:6070 gtk/gtktextview.c:8987 -+#: gtk/gtklabel.c:5657 gtk/gtktext.c:6074 gtk/gtktextview.c:8987 - msgid "Select _All" - msgstr "З_егьы алхра" - -@@ -2593,73 +2593,73 @@ msgstr "_Мап" - msgid "_Yes" - msgstr "_Ааи" - --#: gtk/gtkmountoperation.c:609 -+#: gtk/gtkmountoperation.c:605 - msgid "Co_nnect" - msgstr "_Аҽаҿакра" - --#: gtk/gtkmountoperation.c:675 -+#: gtk/gtkmountoperation.c:671 - msgid "Connect As" - msgstr "" - --#: gtk/gtkmountoperation.c:684 -+#: gtk/gtkmountoperation.c:680 - msgid "_Anonymous" - msgstr "" - --#: gtk/gtkmountoperation.c:691 -+#: gtk/gtkmountoperation.c:687 - msgid "Registered U_ser" - msgstr "_Иҭагалоу ахархәаҩ" - --#: gtk/gtkmountoperation.c:701 -+#: gtk/gtkmountoperation.c:697 - msgid "_Username" - msgstr "_Ахархәаҩ ихьӡ" - --#: gtk/gtkmountoperation.c:706 -+#: gtk/gtkmountoperation.c:702 - msgid "_Domain" - msgstr "_Адомен" - --#: gtk/gtkmountoperation.c:715 -+#: gtk/gtkmountoperation.c:711 - msgid "Volume type" - msgstr "" - --#: gtk/gtkmountoperation.c:725 -+#: gtk/gtkmountoperation.c:721 - msgid "_Hidden" - msgstr "" - --#: gtk/gtkmountoperation.c:728 -+#: gtk/gtkmountoperation.c:724 - msgid "_Windows system" - msgstr "" - --#: gtk/gtkmountoperation.c:731 -+#: gtk/gtkmountoperation.c:727 - msgid "_PIM" - msgstr "_PIM" - --#: gtk/gtkmountoperation.c:737 -+#: gtk/gtkmountoperation.c:733 - msgid "_Password" - msgstr "_Ажәамаӡа" - --#: gtk/gtkmountoperation.c:759 -+#: gtk/gtkmountoperation.c:755 - msgid "Forget password _immediately" - msgstr "_Зыԥшрада апароль ахаршҭра" - --#: gtk/gtkmountoperation.c:769 -+#: gtk/gtkmountoperation.c:765 - msgid "Remember password until you _logout" - msgstr "" - --#: gtk/gtkmountoperation.c:780 -+#: gtk/gtkmountoperation.c:776 - msgid "Remember _forever" - msgstr "Наунагӡа _агәынкылара" - --#: gtk/gtkmountoperation.c:1206 -+#: gtk/gtkmountoperation.c:1260 - #, c-format - msgid "Unknown Application (PID %d)" - msgstr "" - --#: gtk/gtkmountoperation.c:1405 -+#: gtk/gtkmountoperation.c:1421 - #, c-format - msgid "Unable to end process" - msgstr "" - --#: gtk/gtkmountoperation.c:1435 -+#: gtk/gtkmountoperation.c:1571 - msgid "_End Process" - msgstr "" - -@@ -2669,27 +2669,27 @@ msgid "Cannot kill process with PID %d. Operation is not implemented." - msgstr "" - - #. translators: this string is a name for the 'less' command --#: gtk/gtkmountoperation-x11.c:984 -+#: gtk/gtkmountoperation-x11.c:987 - msgid "Terminal Pager" - msgstr "" - --#: gtk/gtkmountoperation-x11.c:985 -+#: gtk/gtkmountoperation-x11.c:988 - msgid "Top Command" - msgstr "" - --#: gtk/gtkmountoperation-x11.c:986 -+#: gtk/gtkmountoperation-x11.c:989 - msgid "Bourne Again Shell" - msgstr "Bourne Again Shell" - --#: gtk/gtkmountoperation-x11.c:987 -+#: gtk/gtkmountoperation-x11.c:990 - msgid "Bourne Shell" - msgstr "Bourne Shell" - --#: gtk/gtkmountoperation-x11.c:988 -+#: gtk/gtkmountoperation-x11.c:991 - msgid "Z Shell" - msgstr "Z Shell" - --#: gtk/gtkmountoperation-x11.c:1085 -+#: gtk/gtkmountoperation-x11.c:1091 - #, c-format - msgid "Cannot end process with PID %d: %s" - msgstr "" -@@ -3078,7 +3078,7 @@ msgstr[1] "" - - #: gtk/gtkplacesviewrow.c:471 - msgid "Disconnect" --msgstr "Аҿыхра" -+msgstr "Аҽаҿыхра" - - #: gtk/gtkplacesviewrow.c:471 gtk/ui/gtkplacesviewrow.ui:53 - #: gtk/ui/gtksidebarrow.ui:50 -@@ -3449,7 +3449,7 @@ msgctxt "accessibility" - msgid "Sidebar" - msgstr "" - --#: gtk/gtktext.c:6075 gtk/gtktextview.c:8992 -+#: gtk/gtktext.c:6079 gtk/gtktextview.c:8992 - msgid "Insert _Emoji" - msgstr "" - -@@ -3750,7 +3750,7 @@ msgstr "" - - #: gtk/inspector/general.ui:470 - msgid "Display" --msgstr "Аԥшра" -+msgstr "Адисплеи" - - #: gtk/inspector/general.ui:497 - msgid "RGBA Visual" -@@ -3906,15 +3906,15 @@ msgstr "" - #: gtk/inspector/prop-editor.c:845 - #, c-format - msgid "%s with type %s" --msgstr "" -+msgstr "%s измоу хкыс %s" - - #. Translators: Both %s are type names, for example - #. * GtkObjectExpression for GtkStringObject 0x23456789 - #. - #: gtk/inspector/prop-editor.c:858 --#, c-format -+#, fuzzy, c-format - msgid "%s for %s %p" --msgstr "" -+msgstr "%s %p рзы %s " - - #. Translators: Both %s are type names, for example - #. * GtkPropertyExpression with value type: gchararray -@@ -4307,7 +4307,7 @@ msgstr "Аҟаҵарақәа" - - #: gtk/inspector/window.ui:468 - msgid "Menu" --msgstr "" -+msgstr "Амениу" - - #: gtk/inspector/window.ui:477 - msgid "Controllers" -@@ -7102,7 +7102,7 @@ msgstr "" - #: tools/gtk-launch.c:86 - #, c-format - msgid "Error parsing commandline options: %s\n" --msgstr "" -+msgstr "Адҵатә цәаҳәа ахышәарақәа реилыргара залымшахеит : %s\n" - - #: tools/gtk-launch.c:88 tools/gtk-launch.c:109 - #, c-format diff --git a/debian/patches/Update-Turkish-translation-1.patch b/debian/patches/Update-Turkish-translation-1.patch deleted file mode 100644 index 157f1a537e..0000000000 --- a/debian/patches/Update-Turkish-translation-1.patch +++ /dev/null @@ -1,114 +0,0 @@ -From: =?utf-8?q?Emin_Tufan_=C3=87etin?= -Date: Wed, 11 Jan 2023 06:59:32 +0000 -Subject: Update Turkish translation - -Origin: upstream, 4.8.4, commit:83284e6a9db63f84596a5c08c7d24b055df86b95 ---- - po/tr.po | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/po/tr.po b/po/tr.po -index 072c2a4..41e3bee 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -16,22 +16,22 @@ - # Muhammet Kara , 2014, 2015, 2017. - # Furkan Ahmet Kara , 2018. - # Sabri Ünal , 2022. --# Emin Tufan Çetin , 2018, 2019, 2020, 2021, 2022. -+# Emin Tufan Çetin , 2018-2023. - # - msgid "" - msgstr "" - "Project-Id-Version: gtk+\n" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gtk/-/issues/\n" - "POT-Creation-Date: 2023-01-02 15:10+0000\n" --"PO-Revision-Date: 2023-01-10 12:35+0300\n" --"Last-Translator: Sabri Ünal \n" --"Language-Team: Türkçe \n" -+"PO-Revision-Date: 2023-01-11 09:58+0300\n" -+"Last-Translator: Emin Tufan Çetin \n" -+"Language-Team: Turkish \n" - "Language: tr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Poedit 3.1.1\n" -+"Plural-Forms: nplurals=1; plural=0\n" -+"X-Generator: Gtranslator 42.0\n" - - #: gdk/broadway/gdkbroadway-server.c:135 - #, c-format -@@ -204,7 +204,7 @@ msgstr "Escape" - #: gdk/keynamesprivate.h:6850 - msgctxt "keyboard label" - msgid "Multi_key" --msgstr "Çoklu Tuş" -+msgstr "Compose" - - #: gdk/keynamesprivate.h:6851 - msgctxt "keyboard label" -@@ -275,7 +275,7 @@ msgstr "Boşluk (numerik klavye)" - #: gdk/keynamesprivate.h:6865 - msgctxt "keyboard label" - msgid "KP_Tab" --msgstr "Tab (numerik klavye)" -+msgstr "Sekme (numerik klavye)" - - #: gdk/keynamesprivate.h:6866 - msgctxt "keyboard label" -@@ -295,7 +295,7 @@ msgstr "Sol (numerik klavye)" - #: gdk/keynamesprivate.h:6869 - msgctxt "keyboard label" - msgid "KP_Up" --msgstr "Up (numerik klavye)" -+msgstr "Yukarı (numerik klavye)" - - #: gdk/keynamesprivate.h:6870 - msgctxt "keyboard label" -@@ -360,7 +360,7 @@ msgstr "Monitör Parlaklığını Artır" - #: gdk/keynamesprivate.h:6882 - msgctxt "keyboard label" - msgid "MonBrightnessDown" --msgstr "Monitör Parlaklığını Azalt" -+msgstr "Monitör Parlaklığını Düşür" - - #: gdk/keynamesprivate.h:6883 - msgctxt "keyboard label" -@@ -370,7 +370,7 @@ msgstr "Klavye Parlaklığını Artır" - #: gdk/keynamesprivate.h:6884 - msgctxt "keyboard label" - msgid "KbdBrightnessDown" --msgstr "Klavye Parlaklığını Azalt" -+msgstr "Klavye Parlaklığını Düşür" - - #: gdk/keynamesprivate.h:6885 - msgctxt "keyboard label" -@@ -390,7 +390,7 @@ msgstr "Sesi Azalt" - #: gdk/keynamesprivate.h:6888 - msgctxt "keyboard label" - msgid "AudioRaiseVolume" --msgstr "Sesi Yükselt" -+msgstr "Sesi Artır" - - #: gdk/keynamesprivate.h:6889 - msgctxt "keyboard label" -@@ -460,7 +460,7 @@ msgstr "WWW" - #: gdk/keynamesprivate.h:6902 - msgctxt "keyboard label" - msgid "Search" --msgstr "Arama" -+msgstr "Ara" - - #: gdk/keynamesprivate.h:6903 - msgctxt "keyboard label" -@@ -1122,7 +1122,7 @@ msgstr "Meta" - #: gtk/gtkaccelgroup.c:942 - msgctxt "keyboard label" - msgid "KP" --msgstr "NK" -+msgstr "Numerik Klavye" - - #: gtk/gtkaccelgroup.c:949 - msgctxt "keyboard label" diff --git a/debian/patches/Update-Turkish-translation-2.patch b/debian/patches/Update-Turkish-translation-2.patch deleted file mode 100644 index 050655e5ea..0000000000 --- a/debian/patches/Update-Turkish-translation-2.patch +++ /dev/null @@ -1,121 +0,0 @@ -From: =?utf-8?q?Sabri_=C3=9Cnal?= -Date: Sun, 15 Jan 2023 22:43:19 +0000 -Subject: Update Turkish translation - -Origin: upstream, 4.8.4, commit:1ef03e6eb8f27d25b97df1b7bc766df402ad75a8 ---- - po/tr.po | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/po/tr.po b/po/tr.po -index 41e3bee..d573adf 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -1,6 +1,6 @@ - # Turkish translations of gtk+. - # Copyright (C) 1999-2003, 2004, 2006, 2007 Free Software Foundation, Inc. --# Copyright (C) 2008-2022 gtk+'s COPYRIGHT HOLDER -+# Copyright (C) 2008-2023 gtk+'s COPYRIGHT HOLDER - # This file is distributed under the same licence as the gtk+ package. - # - # Arman Aksoy , 2014, 2015, 2017. - # Furkan Ahmet Kara , 2018. - # Sabri Ünal , 2022. --# Emin Tufan Çetin , 2018-2023. -+# Emin Tufan Çetin , 2018, 2019, 2020, 2021, 2022. - # - msgid "" - msgstr "" - "Project-Id-Version: gtk+\n" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gtk/-/issues/\n" - "POT-Creation-Date: 2023-01-02 15:10+0000\n" --"PO-Revision-Date: 2023-01-11 09:58+0300\n" -+"PO-Revision-Date: 2022-10-01 17:55+0300\n" - "Last-Translator: Emin Tufan Çetin \n" --"Language-Team: Turkish \n" -+"Language-Team: Türkçe \n" - "Language: tr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=1; plural=0\n" --"X-Generator: Gtranslator 42.0\n" -+"Plural-Forms: nplurals=1; plural=0;\n" -+"X-Generator: Poedit 3.1.1\n" - - #: gdk/broadway/gdkbroadway-server.c:135 - #, c-format -@@ -204,7 +204,7 @@ msgstr "Escape" - #: gdk/keynamesprivate.h:6850 - msgctxt "keyboard label" - msgid "Multi_key" --msgstr "Compose" -+msgstr "Çoklu Tuş" - - #: gdk/keynamesprivate.h:6851 - msgctxt "keyboard label" -@@ -275,7 +275,7 @@ msgstr "Boşluk (numerik klavye)" - #: gdk/keynamesprivate.h:6865 - msgctxt "keyboard label" - msgid "KP_Tab" --msgstr "Sekme (numerik klavye)" -+msgstr "Tab (numerik klavye)" - - #: gdk/keynamesprivate.h:6866 - msgctxt "keyboard label" -@@ -295,7 +295,7 @@ msgstr "Sol (numerik klavye)" - #: gdk/keynamesprivate.h:6869 - msgctxt "keyboard label" - msgid "KP_Up" --msgstr "Yukarı (numerik klavye)" -+msgstr "Up (numerik klavye)" - - #: gdk/keynamesprivate.h:6870 - msgctxt "keyboard label" -@@ -360,7 +360,7 @@ msgstr "Monitör Parlaklığını Artır" - #: gdk/keynamesprivate.h:6882 - msgctxt "keyboard label" - msgid "MonBrightnessDown" --msgstr "Monitör Parlaklığını Düşür" -+msgstr "Monitör Parlaklığını Azalt" - - #: gdk/keynamesprivate.h:6883 - msgctxt "keyboard label" -@@ -370,7 +370,7 @@ msgstr "Klavye Parlaklığını Artır" - #: gdk/keynamesprivate.h:6884 - msgctxt "keyboard label" - msgid "KbdBrightnessDown" --msgstr "Klavye Parlaklığını Düşür" -+msgstr "Klavye Parlaklığını Azalt" - - #: gdk/keynamesprivate.h:6885 - msgctxt "keyboard label" -@@ -390,7 +390,7 @@ msgstr "Sesi Azalt" - #: gdk/keynamesprivate.h:6888 - msgctxt "keyboard label" - msgid "AudioRaiseVolume" --msgstr "Sesi Artır" -+msgstr "Sesi Yükselt" - - #: gdk/keynamesprivate.h:6889 - msgctxt "keyboard label" -@@ -460,7 +460,7 @@ msgstr "WWW" - #: gdk/keynamesprivate.h:6902 - msgctxt "keyboard label" - msgid "Search" --msgstr "Ara" -+msgstr "Arama" - - #: gdk/keynamesprivate.h:6903 - msgctxt "keyboard label" -@@ -6094,7 +6094,7 @@ msgstr "Yazı tipi adı ara" - - #: gtk/ui/gtkfontchooserwidget.ui:79 - msgid "Filter by" --msgstr "_Süzgeç" -+msgstr "Süzgeç" - - #: gtk/ui/gtkfontchooserwidget.ui:89 - msgid "Monospace" diff --git a/debian/patches/Update-Turkish-translation.patch b/debian/patches/Update-Turkish-translation.patch deleted file mode 100644 index 880eb99598..0000000000 --- a/debian/patches/Update-Turkish-translation.patch +++ /dev/null @@ -1,291 +0,0 @@ -From: =?utf-8?q?Sabri_=C3=9Cnal?= -Date: Wed, 11 Jan 2023 05:31:28 +0000 -Subject: Update Turkish translation - -Origin: upstream, 4.8.4, commit:4a38d5d1d53326bf4444146c665e92800b827243 ---- - po/tr.po | 90 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 45 insertions(+), 45 deletions(-) - -diff --git a/po/tr.po b/po/tr.po -index 0d06ef2..072c2a4 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -22,9 +22,9 @@ msgid "" - msgstr "" - "Project-Id-Version: gtk+\n" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gtk/-/issues/\n" --"POT-Creation-Date: 2022-10-01 14:56+0000\n" --"PO-Revision-Date: 2022-10-01 17:55+0300\n" --"Last-Translator: Emin Tufan Çetin \n" -+"POT-Creation-Date: 2023-01-02 15:10+0000\n" -+"PO-Revision-Date: 2023-01-10 12:35+0300\n" -+"Last-Translator: Sabri Ünal \n" - "Language-Team: Türkçe \n" - "Language: tr\n" - "MIME-Version: 1.0\n" -@@ -121,12 +121,12 @@ msgstr "Diğer uygulamalardan sürükle ve bırak desteklenmemektedir." - msgid "No compatible formats to transfer contents." - msgstr "İçerikleri aktarmak için uyumlu biçim yok." - --#: gdk/gdkglcontext.c:394 gdk/x11/gdkglcontext-glx.c:604 -+#: gdk/gdkglcontext.c:394 gdk/x11/gdkglcontext-glx.c:610 - msgid "No GL API allowed." - msgstr "İzin verilen GP API yok." - - #: gdk/gdkglcontext.c:418 gdk/win32/gdkglcontext-win32-wgl.c:611 --#: gdk/x11/gdkglcontext-glx.c:638 -+#: gdk/x11/gdkglcontext-glx.c:644 - msgid "Unable to create a GL context" - msgstr "GL bağlamı oluşturulamadı" - -@@ -576,7 +576,7 @@ msgid "Reading data failed at row %d" - msgstr "Veri okunurken %d. satırda hata" - - #: gdk/macos/gdkmacosclipboard.c:557 gdk/wayland/gdkclipboard-wayland.c:240 --#: gdk/wayland/gdkdrop-wayland.c:208 gdk/wayland/gdkprimary-wayland.c:335 -+#: gdk/wayland/gdkdrop-wayland.c:208 gdk/wayland/gdkprimary-wayland.c:336 - #: gdk/win32/gdkdrop-win32.c:1018 gdk/win32/gdkdrop-win32.c:1063 - #: gdk/x11/gdkclipboard-x11.c:805 gdk/x11/gdkdrop-x11.c:235 - msgid "No compatible transfer format found" -@@ -773,15 +773,15 @@ msgstr "Pano yöneticisi seçimi depolayamadı." - msgid "Cannot store clipboard. No clipboard manager is active." - msgstr "Pano depolanamadı. Aktif pano yöneticisi yok." - --#: gdk/x11/gdkglcontext-glx.c:754 -+#: gdk/x11/gdkglcontext-glx.c:760 - msgid "No GLX configurations available" - msgstr "Kullanılabilir GLX yapılandırması yok" - --#: gdk/x11/gdkglcontext-glx.c:827 -+#: gdk/x11/gdkglcontext-glx.c:833 - msgid "No GLX configuration with required features found" - msgstr "Gerekli özellikleri olan GLX yapılandırması bulunamadı" - --#: gdk/x11/gdkglcontext-glx.c:901 -+#: gdk/x11/gdkglcontext-glx.c:907 - msgid "GLX is not supported" - msgstr "GLX desteklenmiyor" - -@@ -1122,7 +1122,7 @@ msgstr "Meta" - #: gtk/gtkaccelgroup.c:942 - msgctxt "keyboard label" - msgid "KP" --msgstr "Numerik Klavye" -+msgstr "NK" - - #: gtk/gtkaccelgroup.c:949 - msgctxt "keyboard label" -@@ -2101,10 +2101,10 @@ msgstr "Bu adda dosya zaten var" - #: gtk/gtkfilechoosernative.c:509 gtk/gtkfilechoosernative.c:580 - #: gtk/gtkfilechooserwidget.c:1210 gtk/gtkfilechooserwidget.c:5800 - #: gtk/gtkmessagedialog.c:166 gtk/gtkmessagedialog.c:175 --#: gtk/gtkmountoperation.c:608 gtk/gtkpagesetupunixdialog.c:283 -+#: gtk/gtkmountoperation.c:604 gtk/gtkpagesetupunixdialog.c:283 - #: gtk/gtkprintbackend.c:637 gtk/gtkprinteroptionwidget.c:721 - #: gtk/gtkprintunixdialog.c:651 gtk/gtkprintunixdialog.c:807 --#: gtk/gtkwindow.c:6116 gtk/inspector/css-editor.c:248 -+#: gtk/gtkwindow.c:6152 gtk/inspector/css-editor.c:248 - #: gtk/inspector/recorder.c:1723 gtk/ui/gtkappchooserdialog.ui:45 - #: gtk/ui/gtkassistant.ui:52 gtk/ui/gtkcolorchooserdialog.ui:33 - #: gtk/ui/gtkfontchooserdialog.ui:24 -@@ -2195,7 +2195,7 @@ msgid "If you delete an item, it will be permanently lost." - msgstr "Eğer bir öge silerseniz kalıcı olarak kaybolur." - - #: gtk/gtkfilechooserwidget.c:1211 gtk/gtkfilechooserwidget.c:1827 --#: gtk/gtklabel.c:5652 gtk/gtktext.c:6049 gtk/gtktextview.c:8966 -+#: gtk/gtklabel.c:5652 gtk/gtktext.c:6065 gtk/gtktextview.c:8966 - msgid "_Delete" - msgstr "_Sil" - -@@ -2490,19 +2490,19 @@ msgstr "Karakter Değişkeleri" - msgid "OpenGL context creation failed" - msgstr "OpenGL içerik oluşturulması başarısız oldu" - --#: gtk/gtklabel.c:5649 gtk/gtktext.c:6037 gtk/gtktextview.c:8954 -+#: gtk/gtklabel.c:5649 gtk/gtktext.c:6053 gtk/gtktextview.c:8954 - msgid "Cu_t" - msgstr "Ke_s" - --#: gtk/gtklabel.c:5650 gtk/gtktext.c:6041 gtk/gtktextview.c:8958 -+#: gtk/gtklabel.c:5650 gtk/gtktext.c:6057 gtk/gtktextview.c:8958 - msgid "_Copy" - msgstr "_Kopyala" - --#: gtk/gtklabel.c:5651 gtk/gtktext.c:6045 gtk/gtktextview.c:8962 -+#: gtk/gtklabel.c:5651 gtk/gtktext.c:6061 gtk/gtktextview.c:8962 - msgid "_Paste" - msgstr "_Yapıştır" - --#: gtk/gtklabel.c:5657 gtk/gtktext.c:6058 gtk/gtktextview.c:8987 -+#: gtk/gtklabel.c:5657 gtk/gtktext.c:6074 gtk/gtktextview.c:8987 - msgid "Select _All" - msgstr "_Tümünü Seç" - -@@ -2612,7 +2612,7 @@ msgid "%d:%02d" - msgstr "%d.%02d" - - #: gtk/gtkmessagedialog.c:158 gtk/gtkmessagedialog.c:176 --#: gtk/gtkprintbackend.c:638 gtk/gtkwindow.c:6117 -+#: gtk/gtkprintbackend.c:638 gtk/gtkwindow.c:6153 - msgid "_OK" - msgstr "_Tamam" - -@@ -2624,73 +2624,73 @@ msgstr "_Hayır" - msgid "_Yes" - msgstr "_Evet" - --#: gtk/gtkmountoperation.c:609 -+#: gtk/gtkmountoperation.c:605 - msgid "Co_nnect" - msgstr "Ba_ğlan" - --#: gtk/gtkmountoperation.c:675 -+#: gtk/gtkmountoperation.c:671 - msgid "Connect As" - msgstr "Olarak Bağlan" - --#: gtk/gtkmountoperation.c:684 -+#: gtk/gtkmountoperation.c:680 - msgid "_Anonymous" - msgstr "_Anonim" - --#: gtk/gtkmountoperation.c:691 -+#: gtk/gtkmountoperation.c:687 - msgid "Registered U_ser" - msgstr "Kayıtlı K_ullanıcı" - --#: gtk/gtkmountoperation.c:701 -+#: gtk/gtkmountoperation.c:697 - msgid "_Username" - msgstr "_Kullanıcı Adı" - --#: gtk/gtkmountoperation.c:706 -+#: gtk/gtkmountoperation.c:702 - msgid "_Domain" - msgstr "_Alan" - --#: gtk/gtkmountoperation.c:715 -+#: gtk/gtkmountoperation.c:711 - msgid "Volume type" - msgstr "Birim türü" - --#: gtk/gtkmountoperation.c:725 -+#: gtk/gtkmountoperation.c:721 - msgid "_Hidden" - msgstr "_Gizli" - --#: gtk/gtkmountoperation.c:728 -+#: gtk/gtkmountoperation.c:724 - msgid "_Windows system" - msgstr "_Windows sistemi" - --#: gtk/gtkmountoperation.c:731 -+#: gtk/gtkmountoperation.c:727 - msgid "_PIM" - msgstr "_PIM" - --#: gtk/gtkmountoperation.c:737 -+#: gtk/gtkmountoperation.c:733 - msgid "_Password" - msgstr "_Parola" - --#: gtk/gtkmountoperation.c:759 -+#: gtk/gtkmountoperation.c:755 - msgid "Forget password _immediately" - msgstr "Parolayı _anında unut" - --#: gtk/gtkmountoperation.c:769 -+#: gtk/gtkmountoperation.c:765 - msgid "Remember password until you _logout" - msgstr "Parolayı _çıkış yapana dek anımsa" - --#: gtk/gtkmountoperation.c:780 -+#: gtk/gtkmountoperation.c:776 - msgid "Remember _forever" - msgstr "_Sürekli anımsa" - --#: gtk/gtkmountoperation.c:1206 -+#: gtk/gtkmountoperation.c:1260 - #, c-format - msgid "Unknown Application (PID %d)" - msgstr "Bilinmeyen Uygulama (İşlem Kimliği %d)" - --#: gtk/gtkmountoperation.c:1405 -+#: gtk/gtkmountoperation.c:1421 - #, c-format - msgid "Unable to end process" - msgstr "İşlem sonlandırılamadı" - --#: gtk/gtkmountoperation.c:1435 -+#: gtk/gtkmountoperation.c:1571 - msgid "_End Process" - msgstr "İşlemi _Sonlandır" - -@@ -2700,27 +2700,27 @@ msgid "Cannot kill process with PID %d. Operation is not implemented." - msgstr "%d işlem kimlikli süreç öldürülemiyor. İşlem gerçekleştirilemedi." - - #. translators: this string is a name for the 'less' command --#: gtk/gtkmountoperation-x11.c:984 -+#: gtk/gtkmountoperation-x11.c:987 - msgid "Terminal Pager" - msgstr "Uçbirim Sayfalayıcı" - --#: gtk/gtkmountoperation-x11.c:985 -+#: gtk/gtkmountoperation-x11.c:988 - msgid "Top Command" - msgstr "Üst Komut" - --#: gtk/gtkmountoperation-x11.c:986 -+#: gtk/gtkmountoperation-x11.c:989 - msgid "Bourne Again Shell" - msgstr "Bourne Again Kabuğu" - --#: gtk/gtkmountoperation-x11.c:987 -+#: gtk/gtkmountoperation-x11.c:990 - msgid "Bourne Shell" - msgstr "Bourne Kabuğu" - --#: gtk/gtkmountoperation-x11.c:988 -+#: gtk/gtkmountoperation-x11.c:991 - msgid "Z Shell" - msgstr "Z Kabuğu" - --#: gtk/gtkmountoperation-x11.c:1085 -+#: gtk/gtkmountoperation-x11.c:1091 - #, c-format - msgid "Cannot end process with PID %d: %s" - msgstr "%d işlem kimlikli işlem durdurulamıyor: %s" -@@ -3484,7 +3484,7 @@ msgctxt "accessibility" - msgid "Sidebar" - msgstr "Kenar Çubuğu" - --#: gtk/gtktext.c:6063 gtk/gtktextview.c:8992 -+#: gtk/gtktext.c:6079 gtk/gtktextview.c:8992 - msgid "Insert _Emoji" - msgstr "_Emoji Ekle" - -@@ -3519,12 +3519,12 @@ msgctxt "volume percentage" - msgid "%d %%" - msgstr "%% %d" - --#: gtk/gtkwindow.c:6104 -+#: gtk/gtkwindow.c:6140 - #, c-format - msgid "Do you want to use GTK Inspector?" - msgstr "GTK Denetleyicisi kullanmak istiyor musunuz?" - --#: gtk/gtkwindow.c:6106 -+#: gtk/gtkwindow.c:6142 - #, c-format - msgid "" - "GTK Inspector is an interactive debugger that lets you explore and modify " -@@ -3535,7 +3535,7 @@ msgstr "" - "izin veren etkileşimli hata ayıklayıcıdır. Bunun kullanılması uygulamanın " - "kesilmesine ya da çökmesine neden olabilir." - --#: gtk/gtkwindow.c:6111 -+#: gtk/gtkwindow.c:6147 - msgid "Don’t show this message again" - msgstr "Bu iletiyi yeniden gösterme" - diff --git a/debian/patches/debian/Disable-clipboard-test.patch b/debian/patches/debian/Disable-clipboard-test.patch index c7b7fe26ce..76bfd1bc0d 100644 --- a/debian/patches/debian/Disable-clipboard-test.patch +++ b/debian/patches/debian/Disable-clipboard-test.patch @@ -12,10 +12,10 @@ Forwarded: no 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build -index 3236ce7..45c4744 100644 +index f3d3a1b..cd36ba0 100644 --- a/testsuite/gdk/meson.build +++ b/testsuite/gdk/meson.build -@@ -12,7 +12,9 @@ clipboard_client = executable('clipboard-client', +@@ -9,7 +9,9 @@ clipboard_client = executable('clipboard-client', tests = [ { 'name': 'array' }, { 'name': 'cairo' }, diff --git a/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch b/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch index 388d0f7313..f87e1c425a 100644 --- a/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch +++ b/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch @@ -12,10 +12,10 @@ Forwarded: not-needed, workaround 1 file changed, 2 insertions(+) diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build -index 329348d..8edf55d 100644 +index b8e0ef0..e2ef9c2 100644 --- a/testsuite/reftests/meson.build +++ b/testsuite/reftests/meson.build -@@ -608,6 +608,8 @@ flaky = [ +@@ -613,6 +613,8 @@ flaky = [ 'shorthand-entry-border.ui', # blinking cursors and timing issues make this unreliable 'fixed-widget-stacking.ui', diff --git a/debian/patches/debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch b/debian/patches/debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch index c772906cc5..78b6e7c70f 100644 --- a/debian/patches/debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch +++ b/debian/patches/debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch @@ -42,10 +42,10 @@ index 919957e..7145363 100644 g_object_unref (diff_texture); success = FALSE; diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index a057a2e..78cd4dc 100644 +index d61d833..fba6aa3 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c -@@ -347,6 +347,9 @@ test_ui_file (GFile *file) +@@ -341,6 +341,9 @@ test_ui_file (GFile *file) char *ui_file, *reference_file; GdkTexture *ui_image, *reference_image, *diff_image; GtkStyleProvider *provider; @@ -55,7 +55,7 @@ index a057a2e..78cd4dc 100644 ui_file = g_file_get_path (file); -@@ -378,12 +381,16 @@ test_ui_file (GFile *file) +@@ -372,12 +375,16 @@ test_ui_file (GFile *file) if (reference_image == NULL) reference_image = gdk_memory_texture_new (1, 1, GDK_MEMORY_DEFAULT, g_bytes_new ((guchar[4]) {0, 0, 0, 0}, 4), 4); diff --git a/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch b/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch index f45ae07375..4202e5bc1f 100644 --- a/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch +++ b/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch @@ -82,10 +82,10 @@ index 7145363..2d5fdf9 100644 } diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 78cd4dc..8062854 100644 +index fba6aa3..a2c046c 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c -@@ -308,6 +308,12 @@ save_image (GdkTexture *texture, +@@ -302,6 +302,12 @@ save_image (GdkTexture *texture, g_free (filename); } @@ -98,7 +98,7 @@ index 78cd4dc..8062854 100644 static void save_node (GskRenderNode *node, const char *test_name, -@@ -389,13 +395,37 @@ test_ui_file (GFile *file) +@@ -383,13 +389,37 @@ test_ui_file (GFile *file) if (diff_image) { diff --git a/debian/patches/fontchooser-Drop-a-few-errant-translations.patch b/debian/patches/fontchooser-Drop-a-few-errant-translations.patch deleted file mode 100644 index d7844882d8..0000000000 --- a/debian/patches/fontchooser-Drop-a-few-errant-translations.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Matthias Clasen -Date: Tue, 18 Oct 2022 16:40:37 -0400 -Subject: fontchooser: Drop a few errant translations - -No point in translating these properties, they -are not strings. - -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5146 -Origin: upstream, 4.8.4, commit:92ebf8ab13ab7e24cb2d9971cafd52bc579ab3c3 ---- - gtk/ui/gtkfontchooserwidget.ui | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui -index 9932448..ffd3ae6 100644 ---- a/gtk/ui/gtkfontchooserwidget.ui -+++ b/gtk/ui/gtkfontchooserwidget.ui -@@ -188,7 +188,7 @@ - Preview Font - - -- horizontal -+ horizontal - - - -@@ -217,7 +217,7 @@ - 0 - - -- horizontal -+ horizontal - - - diff --git a/debian/patches/gdk-surface-Handle-clicks-outside-client-surfaces.patch b/debian/patches/gdk-surface-Handle-clicks-outside-client-surfaces.patch deleted file mode 100644 index 9eecc8fb9b..0000000000 --- a/debian/patches/gdk-surface-Handle-clicks-outside-client-surfaces.patch +++ /dev/null @@ -1,88 +0,0 @@ -From: Carlos Garnacho -Date: Fri, 23 Dec 2022 16:04:02 +0100 -Subject: gdk/surface: Handle clicks outside client surfaces - -The owner_events=TRUE grab makes GDK on X11 see events happening -outside every client window as received on the grab window. -Additionally check that the pointer is inside the grab window -(i.e. it received GDK_CROSSING_NORMAL crossing events for the -core pointer) in order to handle clicks happening outside client -windows. - -These new paths are expected to be a no-op on Wayland, and to -also work for touchscreen input on X11, due to emulated pointer -events. - -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5364 -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5400 -Origin: upstream, 4.8.4, commit:826030dcc2e79dcd76d21c118c6a0a3f0994c284 ---- - gdk/gdksurface.c | 26 ++++++++++++++++++-------- - gdk/gdksurfaceprivate.h | 1 + - 2 files changed, 19 insertions(+), 8 deletions(-) - -diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c -index 63d55b2..bcdff00 100644 ---- a/gdk/gdksurface.c -+++ b/gdk/gdksurface.c -@@ -2789,9 +2789,10 @@ check_autohide (GdkEvent *event) - { - GdkDisplay *display; - GdkDevice *device; -- GdkSurface *grab_surface; -+ GdkSurface *grab_surface, *event_surface; -+ GdkEventType evtype = gdk_event_get_event_type (event); - -- switch ((guint) gdk_event_get_event_type (event)) -+ switch ((guint) evtype) - { - case GDK_BUTTON_PRESS: - #if 0 -@@ -2810,13 +2811,15 @@ check_autohide (GdkEvent *event) - device = gdk_event_get_device (event); - if (gdk_device_grab_info (display, device, &grab_surface, NULL)) - { -- GdkSurface *event_surface; -- - event_surface = gdk_event_get_surface (event); -- -- if (grab_surface != event_surface && -- grab_surface != event_surface->parent && -- grab_surface->autohide) -+ if (event_surface->autohide && -+ !event_surface->has_pointer) -+ event_surface = NULL; -+ -+ if (grab_surface->autohide && -+ (!event_surface || -+ (grab_surface != event_surface && -+ grab_surface != event_surface->parent))) - { - GdkSurface *surface = grab_surface; - -@@ -2831,6 +2834,13 @@ check_autohide (GdkEvent *event) - } - } - break; -+ case GDK_ENTER_NOTIFY: -+ case GDK_LEAVE_NOTIFY: -+ event_surface = gdk_event_get_surface (event); -+ if (event_surface->autohide && -+ gdk_crossing_event_get_mode (event) == GDK_CROSSING_NORMAL) -+ event_surface->has_pointer = evtype == GDK_ENTER_NOTIFY; -+ break; - default:; - } - -diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h -index c533685..36cc4a9 100644 ---- a/gdk/gdksurfaceprivate.h -+++ b/gdk/gdksurfaceprivate.h -@@ -77,6 +77,7 @@ struct _GdkSurface - guint autohide : 1; - guint shortcuts_inhibited : 1; - guint request_motion : 1; -+ guint has_pointer : 1; - - guint request_motion_id; - diff --git a/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch b/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch deleted file mode 100644 index 948652bf93..0000000000 --- a/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Carlos Garnacho -Date: Sat, 4 Feb 2023 13:10:42 +0100 -Subject: gdk/x11: Reset all scroll valuators on enter - -We no longer need to make much distinction between multiple logical -devices, plus it breaks esp. with the Xwayland input device distribution. -Just iterate across all devices and reset their scroll valuators. - -Origin: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5479 -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4160 -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5202 -Bug-Debian: https://bugs.debian.org/1029972 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gtk4/+bug/1993594 -Applied-upstream: 4.9.3, commit:824e983372d939693f7eba5c394e647a9035a0f8 ---- - gdk/x11/gdkdevicemanager-xi2.c | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - -diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c -index 02ceb2f..dd3f86c0 100644 ---- a/gdk/x11/gdkdevicemanager-xi2.c -+++ b/gdk/x11/gdkdevicemanager-xi2.c -@@ -2064,19 +2064,10 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator, - xev->detail != XINotifyInferior && xev->mode != XINotifyPassiveUngrab && - GDK_IS_TOPLEVEL (surface)) - { -- if (gdk_x11_device_xi2_get_device_type ((GdkX11DeviceXI2 *) device) != GDK_X11_DEVICE_TYPE_LOGICAL) -- _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (source_device)); -- else -- { -- GList *physical_devices, *l; -- -- physical_devices = gdk_device_list_physical_devices (source_device); -+ GList *l; - -- for (l = physical_devices; l; l = l->next) -- _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (l->data)); -- -- g_list_free (physical_devices); -- } -+ for (l = device_manager->devices; l; l = l->next) -+ _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (l->data)); - } - - event = gdk_crossing_event_new (ev->evtype == XI_Enter diff --git a/debian/patches/gtkcolumnviewcolumn-Only-create-cells-when-the-column-is-.patch b/debian/patches/gtkcolumnviewcolumn-Only-create-cells-when-the-column-is-.patch deleted file mode 100644 index ff6aedad95..0000000000 --- a/debian/patches/gtkcolumnviewcolumn-Only-create-cells-when-the-column-is-.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Benjamin Otte -Date: Thu, 29 Dec 2022 22:21:43 +0000 -Subject: gtkcolumnviewcolumn: Only create cells when the column is visible - -Merge branch 'wip/corey/list-item-visible' into 'main' - -listitemwidget: Setup factory only once the widget is visible - -See merge request GNOME/gtk!5374 - -(cherry picked from commit 188f9269b7e25847d4d50ba12c004f5da81aa352) - -Origin: upstream, 4.8.4, commit:2aaefd9ff67446bcd0fdee90fe0ed3ac8c02fb12 ---- - gtk/gtkcolumnlistitemfactory.c | 9 +++++---- - gtk/gtkcolumnviewcolumn.c | 10 +++------- - 2 files changed, 8 insertions(+), 11 deletions(-) - -diff --git a/gtk/gtkcolumnlistitemfactory.c b/gtk/gtkcolumnlistitemfactory.c -index 9951a7c..d69bd12 100644 ---- a/gtk/gtkcolumnlistitemfactory.c -+++ b/gtk/gtkcolumnlistitemfactory.c -@@ -65,10 +65,11 @@ gtk_column_list_item_factory_setup (GtkListItemFactory *factory, - { - GtkColumnViewColumn *column = g_list_model_get_item (columns, i); - -- gtk_column_list_item_factory_add_column (self, -- widget, -- column, -- FALSE); -+ if (gtk_column_view_column_get_visible (column)) -+ gtk_column_list_item_factory_add_column (self, -+ widget, -+ column, -+ FALSE); - - g_object_unref (column); - } -diff --git a/gtk/gtkcolumnviewcolumn.c b/gtk/gtkcolumnviewcolumn.c -index 74c89c0..7520989 100644 ---- a/gtk/gtkcolumnviewcolumn.c -+++ b/gtk/gtkcolumnviewcolumn.c -@@ -551,7 +551,8 @@ gtk_column_view_column_remove_header (GtkColumnViewColumn *self) - static void - gtk_column_view_column_ensure_cells (GtkColumnViewColumn *self) - { -- if (self->view && gtk_widget_get_root (GTK_WIDGET (self->view))) -+ if (self->view && gtk_widget_get_root (GTK_WIDGET (self->view)) && -+ gtk_column_view_column_get_visible (self)) - gtk_column_view_column_create_cells (self); - else - gtk_column_view_column_remove_cells (self); -@@ -787,8 +788,6 @@ void - gtk_column_view_column_set_visible (GtkColumnViewColumn *self, - gboolean visible) - { -- GtkColumnViewCell *cell; -- - g_return_if_fail (GTK_IS_COLUMN_VIEW_COLUMN (self)); - - if (self->visible == visible) -@@ -802,10 +801,7 @@ gtk_column_view_column_set_visible (GtkColumnViewColumn *self, - if (self->header) - gtk_widget_set_visible (GTK_WIDGET (self->header), visible); - -- for (cell = self->first_cell; cell; cell = gtk_column_view_cell_get_next (cell)) -- { -- gtk_widget_set_visible (GTK_WIDGET (cell), visible); -- } -+ gtk_column_view_column_ensure_cells (self); - - g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_VISIBLE]); - } diff --git a/debian/patches/gtkcssanimatedstyle-Fix-return-of-new_advance.patch b/debian/patches/gtkcssanimatedstyle-Fix-return-of-new_advance.patch deleted file mode 100644 index 7910ace5b0..0000000000 --- a/debian/patches/gtkcssanimatedstyle-Fix-return-of-new_advance.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Matteo Percivaldi -Date: Fri, 13 Jan 2023 14:05:10 +0100 -Subject: gtkcssanimatedstyle: Fix return of new_advance() - -This was causing animation and transition to stop randomly and reset -their state to initial state. - -This issue has existed since commit -7b68bdb8316fc1bb96c4a5ad16c1885506131d22. - -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4426 -Origin: upstream, 4.8.4, commit:1ff3a26c9644fbcbd91107280ff1ef839d4ea2f2 ---- - gtk/gtkcssanimatedstyle.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gtk/gtkcssanimatedstyle.c b/gtk/gtkcssanimatedstyle.c -index fdfcf17..17287f2 100644 ---- a/gtk/gtkcssanimatedstyle.c -+++ b/gtk/gtkcssanimatedstyle.c -@@ -937,9 +937,12 @@ gtk_css_animated_style_new_advance (GtkCssAnimatedStyle *source, - gtk_internal_return_val_if_fail (GTK_IS_CSS_ANIMATED_STYLE (source), NULL); - gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (base_style), NULL); - -- if (timestamp == 0 || timestamp == source->current_time) -+ if (timestamp == 0) - return g_object_ref (source->style); - -+ if (timestamp == source->current_time) -+ return g_object_ref (GTK_CSS_STYLE (source)); -+ - gtk_internal_return_val_if_fail (timestamp > source->current_time, NULL); - - animations = NULL; diff --git a/debian/patches/node-editor-Save-test-data-relative-to-current-working-di.patch b/debian/patches/node-editor-Save-test-data-relative-to-current-working-di.patch deleted file mode 100644 index 6205944971..0000000000 --- a/debian/patches/node-editor-Save-test-data-relative-to-current-working-di.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Simon McVittie -Date: Tue, 6 Dec 2022 11:13:59 +0000 -Subject: node-editor: Save test data relative to current working directory - -This avoids hard-coding the GTK source directory into the binary, which -would make the binary non-reproducible across different source paths, -particularly in a distro build environment where the source directory -used by autobuilders will often not exist on end-user systems. The node -editor can still be used to create new test-cases by running it with the -GTK source directory as its current working directory. - -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5403 -Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5297 -Signed-off-by: Simon McVittie ---- - demos/node-editor/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/demos/node-editor/meson.build b/demos/node-editor/meson.build -index 03489f3..bd0fe05 100644 ---- a/demos/node-editor/meson.build -+++ b/demos/node-editor/meson.build -@@ -15,7 +15,7 @@ executable('gtk4-node-editor', - dependencies: [ libgtk_dep, demo_conf_h ], - include_directories: confinc, - c_args: [ -- '-DNODE_EDITOR_SOURCE_DIR="@0@/../../testsuite/gsk/compare/"'.format(meson.current_source_dir()) -+ '-DNODE_EDITOR_SOURCE_DIR="testsuite/gsk/compare/"' - ] + common_cflags, - win_subsystem: 'windows', - link_args: extra_demo_ldflags, diff --git a/debian/patches/series b/debian/patches/series index f029df3c7e..deae500c08 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,15 +1,3 @@ -Update-Abkhazian-translation.patch -gtkcolumnviewcolumn-Only-create-cells-when-the-column-is-.patch -Update-Turkish-translation.patch -Update-Turkish-translation-1.patch -gdk-surface-Handle-clicks-outside-client-surfaces.patch -fontchooser-Drop-a-few-errant-translations.patch -gtkcssanimatedstyle-Fix-return-of-new_advance.patch -Update-Turkish-translation-2.patch -testsuite-Use-separate-setups-for-unstable-tests-instead-.patch -testsuite-Don-t-create-.test-files-for-flaky-or-failing-t.patch -node-editor-Save-test-data-relative-to-current-working-di.patch -gdk-x11-Reset-all-scroll-valuators-on-enter.patch debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch debian/reftests-Allow-minor-differences-to-be-tolerated.patch debian/Disable-inscription-markup.ui-reftest.patch diff --git a/debian/patches/testsuite-Don-t-create-.test-files-for-flaky-or-failing-t.patch b/debian/patches/testsuite-Don-t-create-.test-files-for-flaky-or-failing-t.patch deleted file mode 100644 index 1a69b70c12..0000000000 --- a/debian/patches/testsuite-Don-t-create-.test-files-for-flaky-or-failing-t.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Simon McVittie -Date: Wed, 23 Nov 2022 21:26:50 +0000 -Subject: testsuite: Don't create .test files for flaky or failing tests - -These tests can be run manually, but are not suitable for use as an -acceptance test, so let's not make frameworks like Debian's autopkgtest -run these when they run ginsttest-runner in the most obvious way. - -Signed-off-by: Simon McVittie -Applied-upstream: 4.9.2, commit:94b57a967c492ab18df8142557710ba0b1a02cee ---- - testsuite/gdk/meson.build | 6 ++++++ - testsuite/gtk/meson.build | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build -index 7aa0cf6..3236ce7 100644 ---- a/testsuite/gdk/meson.build -+++ b/testsuite/gdk/meson.build -@@ -83,6 +83,12 @@ endforeach - if get_option('install-tests') - foreach t : tests - test_name = t.get('name') -+ suites = t.get('suites', []) -+ -+ if suites.contains('flaky') or suites.contains('failing') -+ continue -+ endif -+ - test_cdata = configuration_data() - test_cdata.set('testexecdir', testexecdir) - test_cdata.set('test', test_name) -diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build -index 926ed06..bc92fa9 100644 ---- a/testsuite/gtk/meson.build -+++ b/testsuite/gtk/meson.build -@@ -291,6 +291,12 @@ endforeach - if get_option('install-tests') - foreach t : tests - test_name = t.get('name') -+ suites = t.get('suites', []) -+ -+ if suites.contains('flaky') or suites.contains('failing') -+ continue -+ endif -+ - conf = configuration_data() - conf.set('testexecdir', testexecdir) - conf.set('test', test_name) diff --git a/debian/patches/testsuite-Use-separate-setups-for-unstable-tests-instead-.patch b/debian/patches/testsuite-Use-separate-setups-for-unstable-tests-instead-.patch deleted file mode 100644 index f38d914ed9..0000000000 --- a/debian/patches/testsuite-Use-separate-setups-for-unstable-tests-instead-.patch +++ /dev/null @@ -1,545 +0,0 @@ -From: Simon McVittie -Date: Wed, 23 Nov 2022 19:13:32 +0000 -Subject: testsuite: Use separate setups for unstable tests instead of - should_fail - -There are two possible interpretations of "expected failure": either -the test *must* fail (exactly the inverse of an ordinary test, with -success becoming failure and failure becoming success), or the test -*may* fail (with success intended, but failure possible in some -environments). Autotools had the second interpretation, which seems -more useful in practice, but Meson has the first. - -Instead of using should_fail, we can put the tests in one of two new -suites: "flaky" is intended for tests that succeed or fail unpredictably -according to the test environment or chance, while "failing" is for -tests that ought to succeed but currently never do as a result of a -bug or missing functionality. With a sufficiently new version of Meson, -the flaky and failing tests are not run by default, but can be requested -by running a setup that does not exclude them, with a command like: - - meson test --setup=x11_unstable --suite=flaky --suite=failing - -As a bonus, now that we're setting up setups and their excluded suites -programmatically, the gsk-compare-broadway tests are also excluded by -default when running the test setup for a non-broadway backend. - -When running the tests in CI, --suite=gtk overrides the default -exclude_suites, so we have to specify --no-suite=flaky and ---no-suite=failing explicitly. - -This arrangement is inspired by GNOME/glib!2987, which was contributed -by Marco Trevisan. - -Signed-off-by: Simon McVittie -Applied-upstream: 4.9.2, commit:957dd49ef7d371926f90212bdf52b92742062e3e ---- - .gitlab-ci.yml | 3 ++ - .gitlab-ci/run-tests.sh | 70 ++++++++++++++++++++++++++++-------- - testsuite/a11y/meson.build | 7 ---- - testsuite/gdk/meson.build | 4 ++- - testsuite/gtk/meson.build | 24 ++++--------- - testsuite/meson.build | 68 +++++++++++++++++------------------ - testsuite/reftests/meson.build | 81 ++++++++++++++++++++++++------------------ - 7 files changed, 147 insertions(+), 110 deletions(-) - -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index dae2128..d2f730f 100644 ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -51,8 +51,11 @@ style-check-diff: - reports: - junit: - - "${CI_PROJECT_DIR}/_build/report-x11.xml" -+ - "${CI_PROJECT_DIR}/_build/report-x11_unstable.xml" - - "${CI_PROJECT_DIR}/_build/report-wayland.xml" -+ - "${CI_PROJECT_DIR}/_build/report-wayland_unstable.xml" - - "${CI_PROJECT_DIR}/_build/report-broadway.xml" -+ - "${CI_PROJECT_DIR}/_build/report-broadway_unstable.xml" - name: "gtk-${CI_COMMIT_REF_NAME}" - paths: - - "${CI_PROJECT_DIR}/_build/meson-logs" -diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh -index e68cf5a..b60c3b3 100755 ---- a/.gitlab-ci/run-tests.sh -+++ b/.gitlab-ci/run-tests.sh -@@ -19,11 +19,21 @@ case "${backend}" in - --print-errorlogs \ - --setup=${backend} \ - --suite=gtk \ -+ --no-suite=failing \ -+ --no-suite=flaky \ - --no-suite=gsk-compare-broadway - - # Store the exit code for the CI run, but always - # generate the reports - exit_code=$? -+ -+ xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \ -+ meson test -C ${builddir} \ -+ --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ -+ --print-errorlogs \ -+ --setup=${backend}_unstable \ -+ --suite=flaky \ -+ --suite=failing || true - ;; - - wayland) -@@ -38,9 +48,18 @@ case "${backend}" in - --print-errorlogs \ - --setup=${backend} \ - --suite=gtk \ -+ --no-suite=failing \ -+ --no-suite=flaky \ - --no-suite=gsk-compare-broadway -- - exit_code=$? -+ -+ meson test -C ${builddir} \ -+ --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ -+ --print-errorlogs \ -+ --setup=${backend}_unstable \ -+ --suite=flaky \ -+ --suite=failing || true -+ - kill ${compositor} - ;; - -@@ -56,9 +75,18 @@ case "${backend}" in - --print-errorlogs \ - --setup=${backend} \ - --suite=gtk \ -+ --no-suite=failing \ -+ --no-suite=flaky \ - --no-suite=gsk-compare-broadway -- - exit_code=$? -+ -+ meson test -C ${builddir} \ -+ --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ -+ --print-errorlogs \ -+ --setup=${backend}_unstable \ -+ --suite=flaky \ -+ --suite=failing || true -+ - kill ${compositor} - ;; - -@@ -74,10 +102,20 @@ case "${backend}" in - --print-errorlogs \ - --setup=${backend} \ - --suite=gtk \ -+ --no-suite=failing \ -+ --no-suite=flaky \ - --no-suite=gsk-compare-opengl - - # don't let Broadway failures fail the run, for now - exit_code=0 -+ -+ meson test -C ${builddir} \ -+ --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ -+ --print-errorlogs \ -+ --setup=${backend}_unstable \ -+ --suite=flaky \ -+ --suite=failing || true -+ - kill ${server} - ;; - -@@ -90,18 +128,20 @@ esac - - cd ${builddir} - --$srcdir/.gitlab-ci/meson-junit-report.py \ -- --project-name=gtk \ -- --backend=${backend} \ -- --job-id="${CI_JOB_NAME}" \ -- --output=report-${backend}.xml \ -- meson-logs/testlog-${backend}.json --$srcdir/.gitlab-ci/meson-html-report.py \ -- --project-name=gtk \ -- --backend=${backend} \ -- --job-id="${CI_JOB_NAME}" \ -- --reftest-output-dir="testsuite/reftests/output/${backend}" \ -- --output=report-${backend}.html \ -- meson-logs/testlog-${backend}.json -+for suffix in "" "_unstable"; do -+ $srcdir/.gitlab-ci/meson-junit-report.py \ -+ --project-name=gtk \ -+ --backend="${backend}${suffix}" \ -+ --job-id="${CI_JOB_NAME}" \ -+ --output="report-${backend}${suffix}.xml" \ -+ "meson-logs/testlog-${backend}${suffix}.json" -+ $srcdir/.gitlab-ci/meson-html-report.py \ -+ --project-name=gtk \ -+ --backend="${backend}${suffix}" \ -+ --job-id="${CI_JOB_NAME}" \ -+ --reftest-output-dir="testsuite/reftests/output/${backend}${suffix}" \ -+ --output="report-${backend}${suffix}.html" \ -+ "meson-logs/testlog-${backend}${suffix}.json" -+done - - exit $exit_code -diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build -index 4f50d3a..4547b21 100644 ---- a/testsuite/a11y/meson.build -+++ b/testsuite/a11y/meson.build -@@ -35,10 +35,6 @@ tests = [ - ] - - --# Tests that are expected to fail --xfail = [ --] -- - is_debug = get_option('buildtype').startswith('debug') - - test_cargs = [] -@@ -76,8 +72,6 @@ foreach t : tests - install_dir: testexecdir, - ) - -- expect_fail = xfail.contains(test_name) -- - if test_extra_suites.contains('slow') - test_timeout = 90 - endif -@@ -88,6 +82,5 @@ foreach t : tests - timeout: test_timeout, - env: test_env, - suite: ['a11y'] + test_extra_suites, -- should_fail: expect_fail, - ) - endforeach -diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build -index 03528a3..7aa0cf6 100644 ---- a/testsuite/gdk/meson.build -+++ b/testsuite/gdk/meson.build -@@ -39,6 +39,8 @@ foreach t : tests - install_dir: testexecdir, - ) - -+ suites = ['gdk'] + t.get('suites', []) -+ - test(test_name, test_exe, - args: [ '--tap', '-k' ], - protocol: 'tap', -@@ -48,7 +50,7 @@ foreach t : tests - 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), - 'DBUS_SESSION_BUS_ADDRESS=', - ], -- suite: 'gdk', -+ suite: suites, - ) - endforeach - -diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build -index b9f0396..926ed06 100644 ---- a/testsuite/gtk/meson.build -+++ b/testsuite/gtk/meson.build -@@ -23,8 +23,9 @@ endif - # - 'suites': (array): additional test suites - tests = [ - { 'name': 'accel' }, --# sadly, mesons xfail support seems busted --# { 'name': 'accessor-apis' }, -+ # we are still missing some accessors -+ { 'name': 'accessor-apis', -+ 'suites': ['failing'] }, - { 'name': 'action' }, - { 'name': 'adjustment' }, - { 'name': 'bitset' }, -@@ -105,6 +106,9 @@ tests = [ - { 'name': 'revealer-size' }, - { 'name': 'widgetorder' }, - { 'name': 'widget-refcount' }, -+ # This test was disabled for long enough that it no longer compiles -+ #{ 'name': 'window', -+ # 'suites': ['failing'] }, - ] - - # Tests that test private apis and therefore are linked against libgtk-4.a -@@ -128,16 +132,6 @@ internal_tests = [ - { 'name': 'fnmatch' }, - ] - --# Tests that are expected to fail --xfail = [ -- # we are still missing some accessors -- 'accessor-apis', -- # one of the window resizing tests fails after -- # the GdkToplevel refactoring, and needs a big -- # gtkwindow.c configure request cleanup -- 'window', --] -- - is_debug = get_option('buildtype').startswith('debug') - - test_cargs = [] -@@ -181,8 +175,6 @@ foreach t : tests - install_dir: testexecdir, - ) - -- expect_fail = xfail.contains(test_name) -- - if test_extra_suites.contains('slow') - test_timeout = 90 - endif -@@ -193,7 +185,6 @@ foreach t : tests - timeout: test_timeout, - env: test_env, - suite: ['gtk'] + test_extra_suites, -- should_fail: expect_fail, - ) - endforeach - -@@ -214,8 +205,6 @@ foreach t : internal_tests - install_dir: testexecdir, - ) - -- expect_fail = xfail.contains(test_name) -- - if test_extra_suites.contains('slow') - test_timeout = 90 - endif -@@ -226,7 +215,6 @@ foreach t : internal_tests - timeout: test_timeout, - env: test_env, - suite: ['gtk'] + test_extra_suites, -- should_fail: expect_fail, - ) - endforeach - -diff --git a/testsuite/meson.build b/testsuite/meson.build -index 97344f3..688a253 100644 ---- a/testsuite/meson.build -+++ b/testsuite/meson.build -@@ -10,47 +10,45 @@ common_env = [ - 'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir), - 'GDK_DEBUG=default-settings', - ] -+exclude_unstable = ['flaky', 'failing'] - --if x11_enabled -- add_test_setup ('x11', -- env: common_env + [ -- 'GDK_BACKEND=x11', -- 'TEST_OUTPUT_SUBDIR=x11', -- ]) --endif -+setups = [ -+ { 'backend': 'x11', 'if': x11_enabled, }, -+ { 'backend': 'wayland', 'if': wayland_enabled, 'is_default': true, }, -+ { 'name': 'waylandgles', 'backend': 'wayland', 'if': wayland_enabled, -+ 'env': ['GDK_DEBUG=gl-gles,default-settings'], }, -+ { 'backend': 'win32', 'if': os_win32 }, -+ { 'backend': 'broadway', 'if': broadway_enabled, }, -+] - --if wayland_enabled -- add_test_setup ('wayland', -- is_default: true, -- env: common_env + [ -- 'GDK_BACKEND=wayland', -- 'TEST_OUTPUT_SUBDIR=wayland', -- ]) -+foreach setup : setups -+ if setup.get('if') -+ backend = setup.get('backend') -+ name = setup.get('name', backend) -+ exclude = [] - -- add_test_setup ('waylandgles', -- env: common_env + [ -- 'GDK_BACKEND=wayland', -- 'TEST_OUTPUT_SUBDIR=waylandgles', -- 'GDK_DEBUG=gl-gles,default-settings', -- ]) -+ if backend != 'broadway' -+ exclude += 'gsk-compare-broadway' -+ endif - --endif -+ env = common_env + [ -+ 'GDK_BACKEND=@0@'.format(backend), -+ ] + setup.get('env', []) - --if os_win32 -- add_test_setup ('win32', -- env: common_env + [ -- 'GDK_BACKEND=win32', -- 'TEST_OUTPUT_SUBDIR=win32', -- ]) --endif -+ add_test_setup( -+ name, -+ env: env + ['TEST_OUTPUT_SUBDIR=@0@'.format(name)], -+ exclude_suites: exclude_unstable + exclude, -+ is_default: setup.get('is_default', false), -+ ) - --if broadway_enabled -- add_test_setup ('broadway', -- env: common_env + [ -- 'GDK_BACKEND=broadway', -- 'TEST_OUTPUT_SUBDIR=broadway', -- ]) --endif -+ add_test_setup( -+ '@0@_unstable'.format(name), -+ env: env + ['TEST_OUTPUT_SUBDIR=@0@_unstable'.format(name)], -+ exclude_suites: exclude, -+ ) -+ endif -+endforeach - - subdir('performance') - subdir('gdk') -diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build -index 2cd31db..329348d 100644 ---- a/testsuite/reftests/meson.build -+++ b/testsuite/reftests/meson.build -@@ -137,11 +137,9 @@ testdata = [ - 'border-image-url-scaled.css', - 'border-image-url-scaled.ref.ui', - 'border-image-url-scaled.ui', -- # this seems to make assumptions on text positioning -- # that are not valid with subpixel positioning -- #'border-image-url.css', -- #'border-image-url.ref.ui', -- #'border-image-url.ui', -+ 'border-image-url.css', -+ 'border-image-url.ref.ui', -+ 'border-image-url.ui', - 'border-radius-clamp.css', - 'border-radius-clamp.ref.ui', - 'border-radius-clamp.ui', -@@ -382,11 +380,9 @@ testdata = [ - 'label-attribute-preference.css', - 'label-attribute-preference.ref.ui', - 'label-attribute-preference.ui', -- # makes assumptions about text positioning that are not -- # valid with subpixel positioning -- #'label-background.css', -- #'label-background.ref.ui', -- #'label-background.ui', -+ 'label-background.css', -+ 'label-background.ref.ui', -+ 'label-background.ui', - 'label-box-shadow-clip.css', - 'label-box-shadow-clip.ref.ui', - 'label-box-shadow-clip.ui', -@@ -432,10 +428,8 @@ testdata = [ - 'label-wrap-word-char-natural-size.ui', - 'label-wrapped-huge-max-width-chars.ref.ui', - 'label-wrapped-huge-max-width-chars.ui', -- # this seems to make assumptions on text positioning -- # that are not valid with subpixel positioning -- #'label-wrap-justify.ref.ui', -- #'label-wrap-justify.ui', -+ 'label-wrap-justify.ref.ui', -+ 'label-wrap-justify.ui', - 'late-binding.ui', - 'late-binding.ref.ui', - 'late-property.ui', -@@ -559,23 +553,18 @@ testdata = [ - 'textview-border-windows.css', - 'textview-border-windows.ref.ui', - 'textview-border-windows.ui', -- # these tests needs a better way to perform delayed actions -- # they are not in xfail since they succeed on some platforms -- #'textview-margins.css', -- #'textview-margins.ref.ui', -- #'textview-margins.ui', -- #'textview-tags.ref.ui', -- #'textview-tags.ui', -+ 'textview-margins.css', -+ 'textview-margins.ref.ui', -+ 'textview-margins.ui', -+ 'textview-tags.ref.ui', -+ 'textview-tags.ui', - 'treeview-crash-too-wide.ref.ui', - 'treeview-crash-too-wide.ui', - 'treeview-fixed-height.css', - 'treeview-fixed-height.ref.ui', - 'treeview-fixed-height.ui', -- # this test fails with an off-by-one in ci too frequently -- # to be left enabled. Remove it until somebody figures out -- # what is going on there. -- #'treeview-headers-hidden.ref.ui', -- #'treeview-headers-hidden.ui', -+ 'treeview-headers-hidden.ref.ui', -+ 'treeview-headers-hidden.ui', - 'unresolvable.css', - 'unresolvable.ref.ui', - 'unresolvable.ui', -@@ -589,21 +578,36 @@ testdata = [ - 'window-default-size.ui', - 'window-height-for-width.ref.ui', - 'window-height-for-width.ui', -- # this test needs a better way to perform delayed actions -- # it is not in xfail since it succeeds on some platforms -- #'window-show-contents-on-map.ref.ui', -- #'window-show-contents-on-map.ui', -+ 'window-show-contents-on-map.ref.ui', -+ 'window-show-contents-on-map.ui', - 'wrap-margin-align-critical.ref.ui', - 'wrap-margin-align-critical.ui', - 'wrapping-in-boxes-in-boxes.ref.ui', - 'wrapping-in-boxes-in-boxes.ui', - ] - --# These need to be fixed but the issue hasn't been tracked down. - xfails = [ -+ # needs to be fixed but the issue hasn't been tracked down - 'sizegroups-evolution-identity-page.ui', - # the NGL renderer can't deal with non-integer sizes -- 'border-half-pixel.ui' -+ 'border-half-pixel.ui', -+ -+ # makes assumptions about text positioning that are not -+ # valid with subpixel positioning -+ 'border-image-url.ui', -+ 'label-background.ui', -+ 'label-wrap-justify.ui', -+] -+flaky = [ -+ # these tests need a better way to perform delayed actions -+ # they are not in xfails since they succeed on some platforms -+ 'textview-margins.ui', -+ 'textview-tags.ui', -+ 'window-show-contents-on-map.ui', -+ # this test fails with an off-by-one in ci too frequently -+ # to be left enabled. Remove it until somebody figures out -+ # what is going on there. -+ 'treeview-headers-hidden.ui', - ] - - reftest_env = environment() -@@ -616,6 +620,16 @@ reftest_env.set('G_ENABLE_DIAGNOSTIC', '0') - reftest_env.set('REFTEST_MODULE_DIR', meson.current_build_dir()) - - foreach testname : testdata -+ suites = ['reftest'] -+ -+ if flaky.contains(testname) -+ suites += 'flaky' -+ endif -+ -+ if xfails.contains(testname) -+ suites += 'failing' -+ endif -+ - if testname.endswith('.ui') and not testname.endswith('.ref.ui') - test('reftest ' + testname, gtk_reftest, - args: [ -@@ -626,8 +640,7 @@ foreach testname : testdata - ], - protocol: 'tap', - env: reftest_env, -- suite: 'reftest', -- should_fail: xfails.contains(testname), -+ suite: suites, - ) - endif - endforeach -- 2.30.2